| commit | 5cfa89f7a1a60e3340a7c3be70d38159dad23082 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Mon Sep 14 15:55:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 14 15:55:57 2015 +0000 |
| tree | 9b573025f4dde80fa4e43126065b65f40f00bb18 | |
| parent | 96ef062b041972f5fed52cf29b143ef5ac5ae11c [diff] | |
| parent | 026cbbfbda2d3db388bcaf7d8c3897f7856af1f8 [diff] |
am 026cbbfb: am 27a0be36: resolved conflicts for ddf53180 to stage-aosp-master * commit '026cbbfbda2d3db388bcaf7d8c3897f7856af1f8': Remove the aidl tool