| commit | 701bc7b097f12aeff68c6eee78209bfe68596fca | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Fri Jul 22 03:58:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 22 03:58:45 2016 +0000 |
| tree | 867b59a7bb457558c600bf64f2bdcbb8ba035088 | |
| parent | fc429b9f4e55bfb0781670128fdb1816a297cd7d [diff] | |
| parent | 1aa9905aad634649383ba58e4b198f35c858a817 [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master am: e629ced86a am: 1aa9905aad Change-Id: I91b22f0c1116cdf3c95b2c7370921d5052e5dda5