| commit | d16b0945e2a9b5258045c92c7989fa373be35cf2 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Wed Oct 12 14:39:58 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 12 14:39:58 2011 -0700 |
| tree | 6af1e11c0fdf6c5b8c78257eced55a774e193e66 | |
| parent | 5e412a0f7dc7c9847896d8885f9281e8fbc8b490 [diff] | |
| parent | 4336560726fee070ff8c39956a796611303d7140 [diff] |
am 99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29 * commit '99b70f3f5d051261229d1792c169a374fc23326b': DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29