tree 728220fb13ccd5c86fa57132ae49bf60a55c5152
parent 940e4c9d9218ee183c8eb522beb9838c0482084b
parent a4b20d712b9c6cbc562529d3a41bf8ea1515562a
author Jean-Baptiste Queru <jbq@google.com> 1363030097 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030097 -0700

am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':