commit | c004cfd80c5b54c971b8854fa1d10ee23be1c868 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:06:39 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:06:39 2013 -0700 |
tree | e0c31bf436958ff16224f6ae982346dc1f00e8f6 | |
parent | bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3 [diff] | |
parent | b843601a9de78a0015c8d963187efaa530e46d46 [diff] |
am b843601a: am 77acfc4d: (-s ours) am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b843601a9de78a0015c8d963187efaa530e46d46':