OSDN Git Service

Merge "Allow FR in carrier demo mode" into oc-dev
authorChristine Franks <christyfranks@google.com>
Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)
commitd974ccb625aff6533196b0569cf03382db7ee136
tree71e3b3c4b02f7b6ac3e48c3d16424285b88a1618
parent6a50c4555c85a0017e63cea33fc34d157e96160c
parent9ef166a57835dfb147ab1aa02988a9c8e19a55cf
Merge "Allow FR in carrier demo mode" into oc-dev
am: 9ef166a578

Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992