tree d6283bafe3e85870a5ce841321c55b76e79cab8a
parent f8142e5bf355e3b7ddfe5b1c5da6f99a47aac490
parent a3290363e19d97014c00dcb2682b1bafc44d13ed
author Jeff Sharkey <jsharkey@android.com> 1466620878 +0000
committer android-build-merger <android-build-merger@google.com> 1466620878 +0000

Merge \"Start primary storage move outside lock.\" into nyc-dev
am: a3290363e1

Change-Id: Idac9cb8408687f580910fe784802da1b584ade85