| commit | 05a6a4c9d080c32017012772bb05f60c7b45f5c6 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Fri Jun 24 06:14:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 06:14:21 2016 +0000 |
| tree | d4bf5dfb6c6583d5d41538ab89acc31710881a4a | |
| parent | 797bd175e2f5c1605a45a014f5717148f21cbb70 [diff] | |
| parent | 7fb9c475f85c28df8eee0d7ce955946a315a2f8c [diff] |
resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc Change-Id: Ib4dc107656666bc1036bcef920ed55c183a9f283