| commit | 75ee6e5ce0d22a7e944c076909eb503f9f808ab9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 21 00:15:58 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 21 00:15:58 2015 +0000 |
| tree | 73c2352a8db3e4a142694a0a9d7a6078912a0bc7 | |
| parent | a30dc1709e146ceb82035af1282743fe93fa4504 [diff] | |
| parent | 6bf768bf13ad663d556d88db392b73d45034f280 [diff] |
Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp automerge: 6bf768b * commit '6bf768bf13ad663d556d88db392b73d45034f280':