| commit | 43044c21172e76e441ac10909af2ceb705a9d1af | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:10 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:10 2013 +0000 |
| tree | 3d7b9f6ac5ad0ef0605fc64c439e37c53e395982 | |
| parent | dfc5f352b6b2ddb339ae0ce033c6f7d754e1346f [diff] | |
| parent | ff9bdc8cd6330475e636ec988e0251e22b906635 [diff] |
am ff9bdc8c: (-s ours) am 4f5f408b: am 62752611: am 1954242c: am 83e25988: (-s ours) am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'ff9bdc8cd6330475e636ec988e0251e22b906635':