| commit | 80c609024ae0c93a681cc5bb923a52ca4133b5f1 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 23:57:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 23:57:35 2015 +0000 |
| tree | 46df2803f0376ed9581cbd9af6bd43112c5eae44 | |
| parent | 665aba8d85cc6d78274247a420654f9118654191 [diff] | |
| parent | e8eded12e2d66c59b8ccb950867d447be67bfb68 [diff] |
am e8eded12: resolved conflicts for 4c7fd94a to mnc-dev * commit 'e8eded12e2d66c59b8ccb950867d447be67bfb68': DO NOT MERGE: fix breakage