commit | aebc771819da0d55720528c97697751c65f67940 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 27 10:50:21 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:50:21 2015 +0000 |
tree | ebd4d739215332e242fa5cba88f95c0791873d42 | |
parent | bbb3f2b19fff76e0c22f1c309dbc7e64f45aa1d2 [diff] | |
parent | aa2c5b179d91d389354e7ab1b6dba1e3cd633273 [diff] |
am aa2c5b17: (-s ours) am 4241be89: am 08c13e33: Merge "Move frameworks/compile/slang off AndroidConfig.h." * commit 'aa2c5b179d91d389354e7ab1b6dba1e3cd633273':