Jeff Sharkey 177c9c8c14 Merge commit '3bc83eb0' into downstream ...

Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5

2015-07-15 15:54:20 -07:00

..

res

Import translations. DO NOT MERGE

2015-07-15 05:13:54 -07:00

src/com/android/documentsui

Merge commit '3bc83eb0' into downstream

2015-07-15 15:54:20 -07:00

tests

resolved conflicts for merge of 3aff4fc6 to master

2015-06-10 18:22:10 -07:00

Android.mk

…

AndroidManifest.xml

…

wrap_alpha.py

…