| commit | 1e94e123128f2f279f6c2dad1df006a18274a757 | [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 | 70fbe30c9ac1abf717bd4f0ab4cd9ba6b0698a13 [diff] | |
| parent | 2acf4a81dc0c4deef517f3fab8d33b3a5f3059ca [diff] |
resolve merge conflicts of 66277db to stage-aosp-master am: 23a574a195 am: 2acf4a81dc Change-Id: Ib4dc107656666bc1036bcef920ed55c183a9f283