Elliott Hughes 2d17b1aba6 resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp ... Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288		2012-10-03 12:13:38 -07:00
core	resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp	2012-10-03 12:13:38 -07:00
libs/host	Use %zd instead of %d for variables of type ssize_t	2012-02-27 16:06:00 -08:00
target	am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e	2012-10-03 11:55:24 -07:00
tools	am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length	2012-10-02 23:32:42 -07:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!	2012-09-27 15:11:47 -07:00
buildspec.mk.default	Remove the simulator target from all makefiles.	2011-07-11 23:51:37 -07:00
envsetup.sh	Make runhat command work again.	2012-09-26 15:00:59 -07:00