| commit | 5d0ad38c72951ef180742efb27933ecd6e9d9593 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 11:09:46 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Sep 13 11:09:46 2013 -0700 |
| tree | 2ecd75507816e6cb3ae54b1b24c780107f35d991 | |
| parent | 267290b340bee74e5ebbbc60f8c5a9b2a5453957 [diff] | |
| parent | ca2c6f75a87b7ff5578dff531481e1af540b43cc [diff] |
resolved conflicts for merge of ca2c6f75 to jb-mr1-dev-plus-aosp Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e