tree 258b686f008625ed9d549048fde01563efbdebc5
parent a45308f71eda2c1bd7f570c7068d70ad03cb8237
parent b4b4108fe66bc84b26f3857afba95576135f32b2
author Budi Kusmiantoro <budi@google.com> 1423871628 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423871629 +0000

Merge "Remove usage of ViewOutlineProvider, add v21 styles" into ub-deskclock-army