| commit | f20aeaa0333ee9d550adbad4c9e901d3db0bd48c | [log] [tgz] |
|---|---|---|
| author | Paul Soulos <psoulos@google.com> | Wed Nov 12 00:30:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 00:30:41 2014 +0000 |
| tree | c0b0cc422f78aad9bd0f0f0e157fca9669228360 | |
| parent | e323ff0653b07bca0c665be8f3fc5415e27bd2c7 [diff] | |
| parent | 8c5f5fbdfff8e24ccd753c0d17a43f644b06b80a [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp