| commit | d57e7700f35cee4cad341a514049b15eeea6e95a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 27 06:26:26 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 27 06:26:26 2013 +0000 |
| tree | b431db4c90f0916f7b30aaf14d417f60b5d072e0 | |
| parent | 141f40ec900352901d99b2895c16e91d8bdaa080 [diff] | |
| parent | e75a8757220cf47e4e586de1c3199aef4ec0355f [diff] |
am e75a8757: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e75a8757220cf47e4e586de1c3199aef4ec0355f':