| commit | 65bdffa1093fd506c524d53450b61f22ff058415 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Fri Jun 24 06:19:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 24 06:19:04 2016 +0000 |
| tree | a053a6ca45c597c9b1926ba07ca85f2f10b4028a | |
| parent | 38033196cfd222ad684c7352a57c9f2a6d55ecd2 [diff] | |
| parent | 05a6a4c9d080c32017012772bb05f60c7b45f5c6 [diff] |
resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc am: 1e94e12312 Change-Id: I730e6337d5d224b60183dd020dd9098f769974e2