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