tree b9cc54eb96ef3919248a635df5fbe2b78944de0a
parent 65a94f0f3b42be8a215c5f23b6a01db3eb5887eb
parent e6e38b086382207177f91d70188363ce3fe7758d
author Jean-Baptiste Queru <jbq@google.com> 1363032810 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032810 -0700

am e6e38b08: am 49d89c07: (-s ours) am 31173957: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e6e38b086382207177f91d70188363ce3fe7758d':