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

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

2013-09-20 11:21:11 -07:00

..

java

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

2013-09-20 11:21:11 -07:00

jni

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

2013-09-20 11:21:05 -07:00

res

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

2013-09-20 11:20:53 -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