| commit | be802d2c08c640cb05a2ce2879a7d1f3ead88398 | [log] [tgz] |
|---|---|---|
| author | Naveen Leekha <leekha@google.com> | Fri Sep 25 00:04:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 00:04:16 2015 +0000 |
| tree | 4dd3357692118ef35b517e60c61b0d8b702df62a | |
| parent | 94d219913bfbb21b4d3708bc853b6edc6c0c7c8b [diff] | |
| parent | bac4a44ac909dbf09ce7a25bd2173164fc437c74 [diff] |
am bac4a44a: am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev * commit 'bac4a44ac909dbf09ce7a25bd2173164fc437c74': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev