commit | 0a6fba48af31916208a20b2bf142ac7dea0a014a | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:47 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:47 2013 -0700 |
tree | 429519b3bd4fbc7f47ee2be82f2778ef1545fbdd | |
parent | ef5abc369823f634c460c8f24d3cbf310542fe3b [diff] | |
parent | ca53acd700fb14a863d4b84f976698de0fc82af8 [diff] |
am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':