| commit | f066e32f90b32fd14478a06e1b115440faf072d6 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 20:06:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 20:06:50 2015 +0000 |
| tree | 6dad61a8948153ccfb2718b48cbb1d70262f4d2d | |
| parent | 42cb8eefadf27d271dfa36217547def3d124e3b3 [diff] | |
| parent | df59fd8ceb7389f3b75a2e69f37815d5b640cd31 [diff] |
am df59fd8c: resolved conflicts for f2ec6286 to lmp-mr1-dev * commit 'df59fd8ceb7389f3b75a2e69f37815d5b640cd31':