| commit | 05d2ce353938a2d764fc02619e9f6368158edd7f | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Fri Jun 24 13:21:09 2016 +0800 |
| committer | Hung-ying Tyan <tyanh@google.com> | Fri Jun 24 13:21:09 2016 +0800 |
| tree | b5b8e44f5c6bcdbd7259f156a016f4899e756368 | |
| parent | 4f699cb9ea842cee516b32dc7a61911821900744 [diff] | |
| parent | fffbace7673be7932491cb3edef3eec8fa48ebbb [diff] |
resolve merge conflicts of 66277db to stage-aosp-master Change-Id: I58b1f7fec779c707ac4048ae5401087ec4b7c8b0