OSDN Git Service

Merge changes from topic 'jack-d-b3-as-stable' am: 52eafee87a
authorBenoit Lamarche <benoitlamarche@google.com>
Thu, 22 Sep 2016 11:47:56 +0000 (11:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Sep 2016 11:47:56 +0000 (11:47 +0000)
am: 95cea98863

Change-Id: I73136c06aafd0d57192c62a9eeb262de85e00121


Trivial merge