| commit | c627d61f2978d8e76ed8c9cc072884b8fe1a565b | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Dec 11 00:07:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 00:07:50 2014 +0000 |
| tree | d9ea278e8ff3ec50cee5d54d65da7e8e60b2d0a1 | |
| parent | 9e8fbe42e96180f99fb2e2c4eccaa0441eb89b75 [diff] | |
| parent | 3b4ccabc06578a70adb2c0c748ded0410b26a763 [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp