tree fc38678ab4ac738cd00cd6582fad864e7d3ae553
parent 27ae21a3d4c22ef5992dfabb0c29ce7299c1331a
parent 18cd97931c60f7595d7d5d4cdfd4344dde20153f
author Jean-Baptiste Queru <jbq@google.com> 1362517583 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517583 -0800

am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '18cd97931c60f7595d7d5d4cdfd4344dde20153f':