| commit | 6c2eff493f9b6f1db4c86550d78883d0fb9891fc | [log] [tgz] |
|---|---|---|
| author | Naveen Leekha <leekha@google.com> | Fri Sep 25 00:14:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 25 00:14:56 2015 +0000 |
| tree | 5eda0a1cb7768c86cb1441a35182a3f2b49d1e1a | |
| parent | e740857f54fd0654ce17cb01c3c23e7c1b03bfc1 [diff] | |
| parent | be802d2c08c640cb05a2ce2879a7d1f3ead88398 [diff] |
am be802d2c: am bac4a44a: am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev * commit 'be802d2c08c640cb05a2ce2879a7d1f3ead88398': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev