Griff Hazen 5ab311550f am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev ...

* commit '6daf22ca7680261e07dfd298a43d6e473e6c06f6':
  Add addExtras and getExtras to Notification.Builder.

2014-03-06 02:57:21 +00:00

..

java

am 6daf22ca: am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev

2014-03-06 02:57:21 +00:00

jni

am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime"

2014-03-05 20:09:52 +00:00

res

resolved conflicts for merge of 1569d61f to master

2014-03-05 17:56:40 -08:00

tests

Merge "Add timer to wait for screen off"

2014-03-04 00:51:37 +00:00