Makoto Onuki 3b31613088 resolved conflicts for merge of 57db559d to master ...

Change-Id: I645993fe69116f05e2275771b51a36402ba05472

2015-07-06 13:00:51 -07:00

..

res

Import translations. DO NOT MERGE

2015-07-01 07:20:20 -05:00

src/com/android/externalstorage

If user ejects a storage from details, take user to...

2015-07-01 15:11:46 -07:00

Android.mk

…

AndroidManifest.xml

Broadcast hidden volumes, notification polish.

2015-04-18 23:11:00 -07:00