| commit | ce3bf9894b2de850824150a98bee331d37439891 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue Jun 30 14:05:12 2015 -0700 |
| committer | Tao Bao <tbao@google.com> | Tue Jun 30 14:05:12 2015 -0700 |
| tree | 251eadcbd285743def6bba5ad29e6480ef8fa34f | |
| parent | ed959977240f6002ccd342659650782a9fdf7ce7 [diff] | |
| parent | 541200792b111421e27de12b8578f743b1eb9e5a [diff] |
resolved conflicts for merge of 54120079 to mnc-dev-plus-aosp Change-Id: I48787655f304079970b2a6e8f61d0c48431994a0