tree 0373653afbbadd72b33781a8f67c222c4e312dd1
parent a999bc832d7511303c0a40e4838e3130b9bfe8ae
parent 1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5
author Jean-Baptiste Queru <jbq@google.com> 1363032246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032246 -0700

am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5':