OSDN Git Service

Merge "Fix stupid bug." into oc-dev
authorDianne Hackborn <hackbod@google.com>
Mon, 1 May 2017 19:38:17 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 19:38:17 +0000 (19:38 +0000)
commit9acb4c90b3a3575899b98affa2547e9bd44ac54f
tree4d0e5cda49135c959a5fcf1ab81bb4998713c2c6
parentd1a0cdc85faa4da2c21428237613406729906374
parent36fd25eec584f6a6ac6ed0b4ab8612e16e8145d0
Merge "Fix stupid bug." into oc-dev
am: 36fd25eec5

Change-Id: I096332ea215a70f40da85cfbdba1140eb770fef4