am a2094fe7: am dfb7a1f5: am a453b7bd: am ca723c70: am 0154e362: Merge "Rename KeyStyle.getFlag to getFlags"

* commit 'a2094fe77fa2406a99b56a2944ba8381b03dbaed':
main
Tadashi G. Takaoka 2013-10-03 15:21:10 -07:00 committed by Android Git Automerger
commit 72543e808d

Diff Content Not Available