tree 260be3ae7acecccb7ddf72a06a913149ee41661c
parent a374d81605f4ba760db9613dd8aa8d8a0370dab8
parent f4b1aefbaafba7ba290a05bce84f77ee5ad5b043
author Jean-Baptiste Queru <jbq@google.com> 1363030921 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030921 -0700

am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':