| commit | 2eb3d3b55cb1f7f5410e585dd7520e8787de43ea | [log] [tgz] |
|---|---|---|
| author | Todd Poynor <toddpoynor@google.com> | Mon Jul 14 18:52:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 18:52:38 2014 +0000 |
| tree | 83134f2dcaef18e8ffddd3c3a11e868497ac9dac | |
| parent | c6cca01756404f045e31f69ae087646e1c94de60 [diff] | |
| parent | 7b29cc8c026548306e661f22573dc80c8e7fba0f [diff] |
am 7b29cc8c: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp * commit '7b29cc8c026548306e661f22573dc80c8e7fba0f':