Jim Miller f3d1ef00c5 am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev ...

* commit 'af638c4f9daa74b4c8e0905f07e11290f6845abe':
  Add camera affordance to navigation bar on phones

2013-09-19 18:36:57 -07:00

..

java

am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev

2013-09-19 18:36:57 -07:00

jni

am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev

2013-09-19 18:17:05 -07:00

res

am 3372cb26: Merge "Add config setting for default sms app." into klp-dev

2013-09-19 17:30:42 -07:00

tests

Merge "Update the Connectivity Manager test suit to use InstrumentationTestCase." into klp-dev

2013-09-16 21:11:31 +00:00