| commit | 32afc638e9aed9a80cd25d0884406b7394a6ac60 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Jul 13 16:10:19 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 13 16:10:21 2015 +0000 |
| tree | d6a445e4ef1cb8720ed289f0c443d96a75dd3f26 | |
| parent | 85a156223ceee5340ca7b6c31854d2e7ec38e0ff [diff] | |
| parent | 0dacfff5d1d4d4a53490a60a554d7d408ecc29b3 [diff] |
Merge "resolved conflicts for merge of d711426a to mnc-dr-dev" into mnc-dr-dev