Dmitriy Ivanov 5c04c4e7b5 am 6ced3b34: am 0d54e471: Merge "Remove code markers" ...

* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
  Remove code markers

2014-04-15 19:26:34 +00:00

..

java/android

am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close output stream"

2014-04-11 17:44:51 +00:00

jni

am 6ced3b34: am 0d54e471: Merge "Remove code markers"

2014-04-15 19:26:34 +00:00

lib

Add signature|system permission to MediaDrm signer APIs

2014-04-02 16:43:10 -07:00

mca

AArch64: Use long for pointers in media classes

2014-01-15 13:09:27 +00:00

tests

Update framework to use M33 Skia. DO NOT MERGE

2014-03-17 13:57:18 +00:00