| commit | 69412a51f58fa9450f1cb077c8d4b6410128d993 | [log] [tgz] |
|---|---|---|
| author | Naveen Leekha <leekha@google.com> | Thu Sep 24 23:27:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 23:27:31 2015 +0000 |
| tree | f6f11ce1cfe6cd287a059393619b94829faf9849 | |
| parent | 571e27e20e30560985d7c3a3ba8885693695b0fc [diff] | |
| parent | c4bd7211373cf5b745c7d4f849f43f7a2d2b1141 [diff] |
am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev * commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141': resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev