| commit | 32a90b8a65ce65f34c25b6a125069309259be6ea | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Mon Jul 27 17:52:58 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Mon Jul 27 17:52:58 2015 -0700 |
| tree | 8aa0fca8a31de7cb0b09ca6810d20534fc44659b | |
| parent | 6384f5eb3a5afa1023a1557daea26ea7d7c78af9 [diff] | |
| parent | 9267631bae87a62f03338958c6f6c3dcb9af3884 [diff] |
resolved conflicts for merge of 9267631b to mnc-dr-dev-plus-aosp Change-Id: I4df042cfa108261c74127d9e3780efb560645e25