am 0d2a1274: am a9d3960f: Merge "Fix synchronization in onNotNullableQueryComplete" into klp-dev

* commit '0d2a1274bd1a1d1879cae58132165dbe7252e33e':
  Fix synchronization in onNotNullableQueryComplete
tree: 95c2512061841d094a9cdc489e0b3fd50f8fc9b9
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags