tree 3356e4c635f6913d10fbc857cefcbd63d8702ffd
parent 35aa1c14769acad1086349bb63fb290f577934ce
parent eb0df7475b03fc0f3a26e6e7976cfc34fd3ae18f
author Jean-Baptiste Queru <jbq@google.com> 1363032401 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032401 -0700

am eb0df747: am c3879c0b: am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb0df7475b03fc0f3a26e6e7976cfc34fd3ae18f':