OSDN Git Service

Merge "Move caption style to its own class, add presets"
authorAlan Viverette <alanv@google.com>
Mon, 5 Aug 2013 18:32:20 +0000 (18:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 5 Aug 2013 18:32:20 +0000 (18:32 +0000)
1  2 
api/current.txt
core/java/android/provider/Settings.java

diff --cc api/current.txt
Simple merge