| commit | 7915b22e8f70b80a9fc2c41f9734194c58b546fc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:28:17 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:28:17 2013 -0700 |
| tree | 728220fb13ccd5c86fa57132ae49bf60a55c5152 | |
| parent | 940e4c9d9218ee183c8eb522beb9838c0482084b [diff] | |
| parent | a4b20d712b9c6cbc562529d3a41bf8ea1515562a [diff] |
am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':