| commit | 09269ee677e7f16d5e60d4c12016d93f2e9de7bf | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Thu Sep 10 04:15:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 04:15:16 2015 +0000 |
| tree | a0f5bdbc4129e901aae3c402f21f4810a7cd4f44 | |
| parent | 657309ff0c44991c76262c3391306561b5427fbb [diff] | |
| parent | c3a81abd52fcc5b6814372b2cf64989657c68a09 [diff] |
am c3a81abd: am 55b0b265: resolved conflicts for b907d87b to lmp-sprout-dev * commit 'c3a81abd52fcc5b6814372b2cf64989657c68a09':