Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp

Browse Source

* changes:
  Merge changes from topic "am-6a9a8997-43fc-40a2-827f-5f1c575c8748" into oc-dev am: f310c792d4 am: 94b7fafc69 am: e977655e31
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4  -s ours am: a8e2306430  -s ours am: 6ccac2ffc3  -s ours

...

This commit is contained in:

Android Build Merger (Role)

2018-01-25 22:24:12 +00:00

committed by Android (Google) Code Review

parent 0bde9c4355 946eff7423

commit 33fc64360a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available