tree bc6b38b60edf313a4fe76f1de331f94cc48ea935
parent 14687fef57bf7dc1c7732ce585e13528b2098c68
parent 1c27289895098e727484c44e2032a2d71c9f6325
author The Android Open Source Project <initial-contribution@android.com> 1445310338 +0000
committer android-build-merger <android-build-merger@google.com> 1445310338 +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

* commit '1c27289895098e727484c44e2032a2d71c9f6325':