OSDN Git Service

[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd192418...
authorCheney Ni <cheneyni@google.com>
Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)
commit8e2028efe4f62492d427443f6be81e0788a72b63
tree35832edf62ed1ad8e59ec63ea02919826ba33823
parent0f963125d2d39ad4ef366a2f9b9f47759b05b265
parent02482e1edd6cae969c7051b13f5ba770155fbb9e
[automerger skipped] Merge changes from topic "am-dcf0c368-3f3f-440a-998e-f94bd1924189" into oc-dev am: 1718736f85  -s ours am: 3d14101b52  -s ours
am: 02482e1edd  -s ours

Change-Id: I69d112ec62826799d275e32cf5499083e84d13fe