Jesse Hall 0c3b911207 am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev ... * commit '883daf6eed36c11a7cb458f07a88e7a9cea29c27': Make gen more readable, use UNIX-style line endings		2013-04-13 14:21:01 -07:00
build	Fix issue #7271589: Cannot set Ocean HD live wallpaper	2012-10-03 11:27:19 -07:00
cmds	am 9380d78c: Add new resources trace.	2013-04-12 17:06:29 -07:00
data/etc	Implement #8323587, #8323342, #8323590: new features.	2013-03-22 17:24:57 -07:00
include	Merge "Updated comments" into jb-mr2-dev	2013-04-11 17:15:52 +00:00
libs	Merge "Updated comments" into jb-mr2-dev	2013-04-11 17:15:52 +00:00
opengl	Make gen more readable, use UNIX-style line endings	2013-04-10 08:34:54 -07:00
services	Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev	2013-04-13 00:27:32 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00