OSDN Git Service

Merge commit '096d52fb' into manualmerge
authorAlan Viverette <alanv@google.com>
Wed, 4 Jun 2014 18:42:06 +0000 (11:42 -0700)
committerAlan Viverette <alanv@google.com>
Wed, 4 Jun 2014 18:42:06 +0000 (11:42 -0700)
Conflicts:
api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883

1  2 
core/res/res/values/attrs.xml
core/res/res/values/public.xml

Simple merge
Simple merge