| commit | eb5b211c9b607db32e5755e0afbb58107a822146 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 30 15:17:14 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jun 30 15:17:14 2015 -0700 |
| tree | 51b5fb84fc455eecc16fa851792e2bb8c4a95a8d | |
| parent | 168f7049e91663165dce9d62e748b09b09f04ec4 [diff] | |
| parent | 018b380de70afb7a2155164a957a2791099b9584 [diff] |
resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp Change-Id: I9da05b46da2326ae21d164b137be57a9b5220f7b