| commit | 38e80e13d6a5de0e7e3739460d0735559e0d150a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Oct 30 16:14:23 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Oct 30 16:14:23 2014 -0700 |
| tree | 9bea50ad2b8160e89ee4889e30fc02d8c0b23906 | |
| parent | c74d5ba601aafaa6ce59a6a55a77656f069389f9 [diff] | |
| parent | c6af5d96953ad55d86a297326cd3858ce0b9df38 [diff] |
resolved conflicts for merge of c6af5d96 to stage-aosp-master Change-Id: Ibcfd252cdb36bfd822cc782fcabb6041ed9a06a3