| commit | d598ec32d207d416eaba31635e3f1fa8284764cf | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Jul 28 20:18:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 20:18:38 2015 +0000 |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 | |
| parent | 299b70d9d40cdf5d52880cf39be0958f76317d38 [diff] | |
| parent | 147d1e85d3f62fbaa04c0250ab4318660f020aca [diff] |
am 147d1e85: am 0c0d5463: resolved conflicts for merge of 13ef17a3 to mnc-ub-dev b/22609402 * commit '147d1e85d3f62fbaa04c0250ab4318660f020aca':