OSDN Git Service

Merge "Add new category keys." into pi-dev
authorDoris Ling <dling@google.com>
Fri, 11 May 2018 01:02:35 +0000 (18:02 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 01:02:35 +0000 (18:02 -0700)
commit23ab3fdff74a7ef338f6eca46d3920e74f545a70
tree553436f698665c82e90f5591ee692d8e30ff3b01
parentd0c0841247205322b175cb81ed0f3042df26d3ca
parent158d5b7b01570b6e0faae26c025798c0186807b9
Merge "Add new category keys." into pi-dev
am: 158d5b7b01

Change-Id: Ia50d80bea7235ae5e17dd0f23f49d0b0c48e1d81