tree 374bc9528681b6bc179ca02dfcf8ca0d8afc48c5
parent c0048178a1d312e7e05557ba99becd6a89b9e97a
parent 0fe40641db3759088edc1bc7f0182556d77bede6
author Jean-Baptiste Queru <jbq@google.com> 1363032808 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032808 -0700

am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0fe40641db3759088edc1bc7f0182556d77bede6':