Deepanshu Gupta e3950823b6 am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev ...

* commit '465a99260ea1d868e9aa43d08e63cb85892f188e':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

2014-05-13 21:43:52 +00:00

..

aapt

Quick fix to ensure mipmap doesn't get stripped by AAPT

2014-05-13 10:57:53 -07:00

aidl

am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build.

2014-03-08 05:46:48 +00:00

layoutlib

am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

2014-05-13 21:43:52 +00:00

obbtool

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

orientationplot

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

preload

Fix indirect misuse of $(my-dir).

2014-02-28 18:04:37 -08:00

validatekeymaps

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00

velocityplot

Revert "Move frameworks/base/tools/ to frameworks/tools/"

2014-01-27 10:31:04 -08:00