OSDN Git Service

Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a...
authorCharles He <qiurui@google.com>
Thu, 29 Dec 2016 11:53:47 +0000 (11:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 11:53:47 +0000 (11:53 +0000)
am: 2518cfcc59

Change-Id: Ic1496b88e823f14497f21bf86ff16543cb201440


Trivial merge