| commit | e673999ddc5d96e863ece8c51175c16dde50ad0b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:56:19 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:56:19 2013 +0000 |
| tree | 98290727d621e5a023631aaf86277200da67d836 | |
| parent | 77e1af8386ec72fc90c0f8d4eaaaf3cafee00389 [diff] | |
| parent | 758045fad588da0dfa00c2148ce18dbbf0d26cae [diff] |
am 758045fa: (-s ours) am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '758045fad588da0dfa00c2148ce18dbbf0d26cae':