Katie McCormick fb19fc61f2 am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix. ...

* commit '905a5b1477b3a1899ef389dbe081f9c70a4fe13d':
  Doc Update: revert PendingIntent fix.

2014-04-01 00:21:34 +00:00

..

java

am 905a5b14: am 87d9d1a0: Doc Update: revert PendingIntent fix.

2014-04-01 00:21:34 +00:00

jni

resolved conflicts for merge of eaab4df0 to klp-modular-dev-plus-aosp

2014-03-27 12:50:58 +00:00

res

Import translations. DO NOT MERGE

2014-03-31 11:37:11 -07:00

tests

am 560e7541: am 1b007565: am 9b650702: Merge "Fix state transition verification." into klp-dev

2014-03-18 22:34:17 +00:00