commit | 5b8ff09578e647db8575699cf46ab9f6f816f6f8 | [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 | 1bb6a4b89ed9fbba6d73ee8e716c3e9847feaefa [diff] | |
parent | b40ebc54339221a859ca2f09ba31b9542df834e7 [diff] |
resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp Change-Id: I9da05b46da2326ae21d164b137be57a9b5220f7b