am 61c54934: am 6b1b24a0: am 0d2a1274: am a9d3960f: Merge "Fix synchronization in onNotNullableQueryComplete" into klp-dev

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