tree 3ed5f81bb962df0a6295dfc59801180be0ee5732
parent f08c4c89622ddcbc4ed9315fe6b399941dad4939
parent c2e35f33ae6a31d4420672ad4dad46ca297c0db7
author Jean-Baptiste Queru <jbq@google.com> 1363030113 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030113 -0700

am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':