OSDN Git Service

Merge "Fixed a bug where the system could crash when expanding" into nyc-mr1-dev
authorSelim Cinek <cinek@google.com>
Thu, 13 Oct 2016 00:44:21 +0000 (00:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Oct 2016 00:44:21 +0000 (00:44 +0000)
am: 0bdfc7be66

Change-Id: Ic63b6f6bf187ea632a05a6524d3b0f8bef376b74


Trivial merge