OSDN Git Service

Merge changes Ia3853e46,Ic32af2ec,I79c6cc12,Idfd59472,I68720661
authorRichard Uhler <ruhler@google.com>
Fri, 25 Nov 2016 18:21:36 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Nov 2016 18:21:36 +0000 (18:21 +0000)
am: be8440c9f9

Change-Id: Idfcc6d626a2dc31ccf11c7d1756d38bbcf8a202b


Trivial merge