| commit | f6899c8d483b865fea688eb44b5c58bf85eb4f5c | [log] [tgz] |
|---|---|---|
| author | Paul Soulos <psoulos@google.com> | Wed Nov 12 02:51:41 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 12 02:51:41 2014 +0000 |
| tree | 7eb866b1e852f1a8312854b062e394fb624e0135 | |
| parent | ba595fad5a7d184d1f0a09ffef8cf69adf142799 [diff] | |
| parent | f20aeaa0333ee9d550adbad4c9e901d3db0bd48c [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: f20aeaa * commit 'f20aeaa0333ee9d550adbad4c9e901d3db0bd48c':