Brian Carlstrom 8fe9c76d9a resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp ... Change-Id: I636a1ebd2f68e2c505875bf3333f18a8977a0e2c		2014-05-29 14:01:24 -07:00
core	am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files."	2014-05-28 23:41:42 +00:00
libs/host	Support host multilib build	2014-05-14 16:55:04 -07:00
target	resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp	2014-05-29 14:01:24 -07:00
tools	am ed02b7fb: am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible	2014-05-23 21:57:59 +00:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	resolved conflicts for merge of 2267c22b to klp-modular-dev-plus-aosp	2014-05-29 14:01:24 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130	2014-05-22 19:36:15 +00:00