| commit | f3eefeb6625f7590546cb60b0f0211f109f19f69 | [log] [tgz] |
|---|---|---|
| author | Jorge Lucangeli Obes <jorgelo@google.com> | Fri Jul 22 04:05:45 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 22 04:05:45 2016 +0000 |
| tree | 28736c791fdab21838021681e961f0cb208184ab | |
| parent | 3793f70a5034009fdcea7782b359956c3b5697ea [diff] | |
| parent | 701bc7b097f12aeff68c6eee78209bfe68596fca [diff] |
resolve merge conflicts of c6e22ba to stage-aosp-master am: e629ced86a am: 1aa9905aad am: 701bc7b097 Change-Id: I85c28f0a0a0df6f6c98838641c97d72aa4b7e4c9