| commit | 7bf0939e106c975ac897b5d701e116b6c86ab75a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:00:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:00:55 2013 -0700 |
| tree | aef74de8d140339b954cecdac3d4c81ef2a5c433 | |
| parent | 0cc49e8db007f71888bf706420edfc530cf4fbff [diff] | |
| parent | 7298e5ab20b37767cab89e7bc5784eb99d46a749 [diff] |
am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '7298e5ab20b37767cab89e7bc5784eb99d46a749':