| commit | 46eac3120a7b2b317984c2f8b3c0f955706334e7 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Oct 01 05:38:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 01 05:38:06 2015 +0000 |
| tree | c8a4f8bfa35961c41a01267611ec138f3f77e50a | |
| parent | 128f01cf5852bf06945e07cca543de936c555493 [diff] | |
| parent | ba2355c9810ad3113e0705d106b28d9cdcbee759 [diff] |
am ba2355c9: resolved conflicts for 9073a5d9 to stage-aosp-master * commit 'ba2355c9810ad3113e0705d106b28d9cdcbee759': Fix RS NDK usage so we always pull from "current" instead of NDK 8.