| commit | f81db3149b4f732aa4399e5c329069df6b3b6c7b | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Thu Aug 20 16:36:42 2015 -0700 |
| committer | Miao Wang <miaowang@google.com> | Thu Aug 20 16:36:42 2015 -0700 |
| tree | abd556a036c43521f614880ee6f1c4c984348613 | |
| parent | 44b881c95a3a30bfb0d7242353b6134f1eabed56 [diff] | |
| parent | 943fb86412d633da634621381c1a877ce43c243e [diff] |
resolved conflicts for merge of 943fb864 to mnc-dev-plus-aosp Change-Id: Id1fc336d3b86b97d4e32c1d0f5a0cdd2f411279f