tree 16c669af2f21d9cbc58c5abbb754e18429668f1d
parent f6c979e03f0ac1748e5fbf8ed689b2e0c031e64a
parent 17cbfdda28584c5e5fbf67237b8250a1e48e77bd
author Jean-Baptiste Queru <jbq@google.com> 1362685363 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362685363 -0800

am 17cbfdda: (-s ours) am 76bbd39a: (-s ours) am 22c22cf7: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '17cbfdda28584c5e5fbf67237b8250a1e48e77bd':