Jeff Brown b380c4d7ed resolved conflicts for merge of a05088c1 to master ...

Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521

2010-09-08 13:02:55 -07:00

..

android

Add support for secure views.

2010-09-08 11:50:55 -07:00

graphics/jni

For issue #2651381, allow library prelinking.

2010-05-05 18:23:05 -07:00

include/android

resolved conflicts for merge of a05088c1 to master

2010-09-08 13:02:55 -07:00

copy-to-ndk.sh

More native work.

2010-08-11 00:29:59 -07:00