| commit | 0ca50a3db89bdf99240f583a96b93c24290d5c93 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Apr 15 18:06:06 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Apr 15 18:06:06 2013 -0700 |
| tree | ce6bbff3f603a030ff6d159f268055f008b6d6fb | |
| parent | 4ec69e8d26a1149a5844f6ca4721aea73edd8346 [diff] | |
| parent | 4b27762cfe6c2115a538ed65205d7531155f01ce [diff] |
resolved conflicts for merge of 4b27762c to jb-mr1-dev-plus-aosp Change-Id: Ie3e622667fb2300cfb8b1927767dc6402970bf9e