| commit | 8ca227ef75cdb1511ea3b11679526a6de5a99974 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 21 14:15:11 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jun 21 14:15:11 2012 -0700 |
| tree | 9670eae53d83ec1d607eaa7fba8b3262a4000c37 | |
| parent | de574936841bbfa9ad82b5876e214bc918ee777c [diff] | |
| parent | 7c03fb79290de74c8f855275c0878e31a968665b [diff] |
resolved conflicts for merge of 7c03fb79 to jb-dev-plus-aosp Change-Id: Icedbe5a6d7cbcedde53e05249f7e90a390f2f0ea