OSDN Git Service

Merge "Track rename from base/ to android-base/."
authorElliott Hughes <enh@google.com>
Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Dec 2015 01:39:41 +0000 (17:39 -0800)
commita9d5080109623884c8f8e7c3515eaa9ed3f85c58
tree0bee7ad40fffc6a9fed315acf702f0c2bffc2ab5
parent63b77748946dc1c18c758d9094e8b735de5ef249
parent20a8fa98f6b858999b623272a182843259e1044c
Merge "Track rename from base/ to android-base/."
am: 20a8fa98f6

* commit '20a8fa98f6b858999b623272a182843259e1044c':
  Track rename from base/ to android-base/.
CryptCommandListener.cpp
Disk.cpp
EmulatedVolume.cpp
Utils.cpp