Dan Albert 7a79c4cac3 am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master ...

* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
  Stop using namespace std.

2015-03-05 23:50:35 +00:00

..

aapt

resolved conflicts for merge of 701f9c2f to stage-aosp-master

2015-03-05 15:41:39 -08:00

aidl

kill OS_CASE_SENSITIVE

2014-11-10 16:08:50 -08:00

apilint

Catch incompatible API regressions.

2014-09-04 15:46:23 -07:00

layoutlib

am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev

2015-03-02 20:11:02 +00:00

obbtool

Remove superfluous OpenSSL include paths.

2015-01-22 17:15:13 -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

split-select

Process base APK

2015-01-16 14:11:30 -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