Alan Viverette 182637f6c2 am 015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev ...

* commit '015bcd4dd43b850ef209c64dae9c08ccaef9ea80':
  Add warning about using MergeCursor in CursorAdapter

2013-09-30 14:14:43 -07:00

..

java

am 015bcd4d: Merge "Add warning about using MergeCursor in CursorAdapter" into klp-dev

2013-09-30 14:14:43 -07:00

jni

am 917f88f0: am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."

2013-09-27 15:44:14 -07:00

res

am b3bf796f: am aeaecacc: Merge "telephony: Set roam though same named operator" into klp-dev

2013-09-26 13:04:56 -07:00

tests

am bac2fcac: am 326f4505: Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 14:19:18 -07:00