| commit | 2b98d8bf680a66ad90b5131d2662a21455f289b6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 10 18:03:26 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Apr 10 18:03:26 2013 -0700 |
| tree | d505db7fff04e0d32b54ae152debf98b99a0e6d5 | |
| parent | 236ab1f11ae3beaa9fee4c01e8f541429cd0bf62 [diff] | |
| parent | 01ec8332c1ff2c5c13df58df7f96c891b5f73169 [diff] |
resolved conflicts for merge of 01ec8332 to jb-mr1-dev-plus-aosp Change-Id: Ia83e62f734f8a587abce8850300f1a735a7020a7