| commit | c7b3ba5e29241b9705939135104cdf9d6c8d6180 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:34 2013 -0700 |
| tree | e5859691eec11c67ec5d9b33b983a949ec944c7f | |
| parent | 43be13a7c7968ba079c87fed7143ec4b6c642b2e [diff] | |
| parent | a5e1ef4ee0f02d186c96f40690f880e949d10b73 [diff] |
am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a5e1ef4ee0f02d186c96f40690f880e949d10b73':