| commit | c02720316d348434ef2ba78030dd8484be0b35f7 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Tue Jun 30 23:35:23 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Tue Jun 30 23:35:23 2015 -0700 |
| tree | 39b613ba47c781294fadfdd7b25ed409c3e65d2c | |
| parent | ce3b66f542947211ed8ea7e09267bb66ff687a34 [diff] | |
| parent | a1867fb044f9c417510334e0e4f66ae251e840d6 [diff] |
resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp Change-Id: Id0266c63c98b4cb37f49eb2e0fb9a98cbc7ee1de