| commit | 4c7fd94ae9b9231281916c072f9120612e14093b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 23:26:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 23:26:03 2015 +0000 |
| tree | a3e84277218c6f5bac6309f53569a5b840a354b2 | |
| parent | aa76577cae8e971f2d4793edafdbb97233f9c3e8 [diff] | |
| parent | 4e5cc1c801816460cf10d8bb0cae201a0e1c9725 [diff] |
am 4e5cc1c8: resolved conflicts for 12aba5ff to lmp-mr1-app-dev * commit '4e5cc1c801816460cf10d8bb0cae201a0e1c9725': DO NOT MERGE: fix breakage