| commit | 9fd55294ecd52c3a26ca18a281db3ab10616d417 | [log] [tgz] |
|---|---|---|
| author | Vijay Venkatraman <vijaykv@google.com> | Fri Apr 07 20:56:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 07 20:56:11 2017 +0000 |
| tree | b3abbf5cd3f55b8551c5a8753ec2f939b7337d62 | |
| parent | c1afa276c9f43c16091253b36a17d8056da434b3 [diff] | |
| parent | 935b9e1a3b0951da79a4dd7fced901f0bde1139f [diff] |
resolve merge conflicts of cb5474b14 to oc-dev-plus-aosp am: 56d6e891be -s ours Change-Id: I9b7377a4bc15f891b0592c1998fae5b9eaac7782