tree a804fbfe8abe95c9f493943282a76d116213eeed
parent 887cd0c71e756d295f6879e6b3f34753b9d67ce8
parent 997b896eeb49b5aca9807a58ae39b14436ab6e98
author Dianne Hackborn <hackbod@google.com> 1402523770 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402521811 +0000

Merge "Update to reflect KKWT's graduation to API 20." into lmp-preview-dev