Kenny Root 6a0db59901 resolved conflicts for merge of e0b14ea7 to master ...

Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51

2013-12-13 15:59:51 -08:00

..

res

Remove deprecated locales

2013-12-09 22:41:12 +00:00

src/com/android/documentsui

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

tests

…

Android.mk

…

AndroidManifest.xml

Remove persisted stacks when app removed/cleared.

2013-10-24 11:22:20 -07:00