tree a4cff4bdc48dc61d4f08670e8655eab181845524
parent f390d512cac7544adf7647570d72c512b390e1a2
parent a775f5537568f4768cd61931bb1b5314694adc96
author David 'Digit' Turner <digit@google.com> 1276128954 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276128954 -0700

Merge "Allow platforms and samples to be located under development/ndk/{platforms,samples}" into kraken