tree 17059529b70cc4912afee884990078931d58eec4
parent b75b025578f0ea11a5408a173cc762c3739cd69e
parent b07ddf38144665e364e557a39a9d14de40ec5fee
author Charles He <qiurui@google.com> 1483009124 +0000
committer android-build-merger <android-build-merger@google.com> 1483009124 +0000

Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04
am: b07ddf3814

Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e