| commit | 85e0c89ba55188ecc484538efbfdb570606fc1a2 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Apr 28 12:08:15 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Thu Apr 28 12:08:15 2016 -0700 |
| tree | 9e5d618c4446b2e4933b2035b77c8fb846062f93 | |
| parent | 237790ec48e83d1623ce44dd968e15059121df56 [diff] | |
| parent | 1599b981fae5e606713e6c9a1698a7e36ef5ae09 [diff] |
resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f