OSDN Git Service

Merge "Add #defines for some key enums." am: 0c44c05166
authorElliott Hughes <enh@google.com>
Fri, 16 Jun 2017 21:10:00 +0000 (21:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 21:10:00 +0000 (21:10 +0000)
commit206a1fd78b27ab9cd0d2173825febbc64c640359
tree0b6553f23ec728090eb55620223d8b10b1496b4d
parentc34f5019e905a9109ef608541cdd9be1c2747a53
parented283e7926a4e96513894cfd7d9873d6711df26e
Merge "Add #defines for some key enums." am: 0c44c05166
am: ed283e7926

Change-Id: I1324ac46c7bd0212fad673f2bd463b568a3e9967