Mathias Agopian 9f213c8b64 Merge changes I487d4eef,Ia750811f ...

* changes:
  get rid of PixelFormatInfo and simplify things
  get rid of PIXEL_FORMAT_A_8

2013-07-26 20:56:23 +00:00

..

java

Merge "Revert "Add WorkSource capability to AlarmManager""

2013-07-26 19:45:28 +00:00

jni

Merge changes I487d4eef,Ia750811f

2013-07-26 20:56:23 +00:00

res

Merge "Change XML-grammar for (Off)HostApduServices."

2013-07-26 16:52:55 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00