OSDN Git Service

Merge changes I76c426ae,I204f2f6c,I7f4cfc18 am: d4ea1b3b84 am: c4249580f5
authorRob Landley <rob@landley.net>
Thu, 16 Feb 2017 02:38:54 +0000 (02:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 02:38:54 +0000 (02:38 +0000)
am: 50f7b20615

Change-Id: Ia730c0a29f202dbee9269a2329eaf257a322ef8f


Trivial merge