| commit | 23a574a195ebe4f755a1f305952332ed18a1242f | [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 | a4e35be4a44331f22582593d7934620a9422b534 [diff] | |
| parent | 66277db8d06f028b9c2e57778e631891334d6f77 [diff] |
resolve merge conflicts of 66277db to stage-aosp-master Change-Id: I58b1f7fec779c707ac4048ae5401087ec4b7c8b0