| commit | a3eead96b9f1000d403541dad0f086c3b175900a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 11 17:52:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 11 17:52:22 2014 +0000 |
| tree | bb8b442f19130a934f8749843c5a7f221ad2be08 | |
| parent | 3b0f3112d0fed5cf30e2ad3fc6500810b760b35d [diff] | |
| parent | 7e43f0d40d3189ca219c6758f61ffe2a2d411ee2 [diff] |
am 7e43f0d4: resolved conflicts for merge of aedc14b1 to lmp-dev * commit '7e43f0d40d3189ca219c6758f61ffe2a2d411ee2':