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)
commitd2d439e19b2d946095176daed2bb5545cffe696e
treefe571c115728a6a3e11a07ce07f7f78a47ba879c
parentb5c1a16e31018079f31d025a2a4c21b823c9eb5d
parent2518cfcc595f77014ece27f94cbcc24623da9120
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: 0881d980ad" into nyc-mr2-dev-plus-aosp
am: 2518cfcc59

Change-Id: Ic1496b88e823f14497f21bf86ff16543cb201440