| commit | b3a62de9a774665adc551f2700861803b56d7eaf | [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 | 6c30dc19f69719989b9290ea1e0a862a48b671af [diff] | |
| parent | b6dc53d19176cd8f7fce427381cd96952e160997 [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master am: e629ced86a am: 1aa9905aad Change-Id: I91b22f0c1116cdf3c95b2c7370921d5052e5dda5