OSDN Git Service

Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a...
authorCharles He <qiurui@google.com>
Thu, 29 Dec 2016 11:51:43 +0000 (11:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 11:51:43 +0000 (11:51 +0000)
commit2125ea1a008d17f21e2473d6ff894d9c6d12f3bb
treefe571c115728a6a3e11a07ce07f7f78a47ba879c
parenta54f83c99c418d561764132c9b1485bebefac629
parentbf9a3b4b0dcaac45e29c721c74d88b0d85f96b0e
Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578 am: 3ad5df5231 am: fdcec75c74" into nyc-mr2-dev-plus-aosp
am: bf9a3b4b0d

Change-Id: I0dd2ac558534b27371690c7b5f703ec27effeb93