tree 58b6ca77ae2e82e9530fa8468301c666e93a9b67
parent f08a81c4607350683f2061f0fcf6421f01440175
parent 0bc4de4d32283267d661301e7dc9e17301b88954
author The Android Open Source Project <initial-contribution@android.com> 1445311281 +0000
committer android-build-merger <android-build-merger@google.com> 1445311281 +0000

Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 am: 1c27289895 am: 21ee8b28d1
am: 0bc4de4d32

* commit '0bc4de4d32283267d661301e7dc9e17301b88954':