| commit | 3d7790edf468a8b9669f30cca6863c4c0d31aa17 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 04 17:00:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 04 17:00:31 2013 -0800 |
| tree | 9cfd52049db5b888a20d3573800b0169b52ca550 | |
| parent | 9e195d160f128b1cf9275ce9f802a9e8c0fcb3db [diff] | |
| parent | 719df3218b0e922935f2afa396596f6991b68139 [diff] |
am 719df321: (-s ours) Reset to state of AOSP (i.e. MR1.1 + AOSP contributions). DO NOT MERGE. # Via Jean-Baptiste Queru * commit '719df3218b0e922935f2afa396596f6991b68139':