| commit | 53aa7d80cf64f2f2c0c935be8528a513b32341b2 | [log] [tgz] |
|---|---|---|
| author | Naveen Leekha <leekha@google.com> | Thu Sep 24 23:44:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 23:44:56 2015 +0000 |
| tree | a255e7b27ef6f6b363f16d6f60081d44fa98ec87 | |
| parent | 62e5463e248d581ee4faa58c631541b994500793 [diff] | |
| parent | b0127aadafbf3b314475e48772fdcc17939c5a9c [diff] |
am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev * commit 'b0127aadafbf3b314475e48772fdcc17939c5a9c': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev