OSDN Git Service

Merge "Fix stupid bug." into oc-dev am: 36fd25eec5
authorDianne Hackborn <hackbod@google.com>
Mon, 1 May 2017 19:45:59 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 19:45:59 +0000 (19:45 +0000)
commit626c26fbc79e49e6a367bda49291aca40bdb476f
treec9aee03dc79c205a673ad79d44bdd5aae5789a6d
parent0f64feb4e924808f4028a96021d151a5726cce68
parent9acb4c90b3a3575899b98affa2547e9bd44ac54f
Merge "Fix stupid bug." into oc-dev am: 36fd25eec5
am: 9acb4c90b3

Change-Id: I512e780496b4f9d6c60714de06ba1705a1ca1ca3