| commit | 8db292b202cebbfb978b66244c0d52553cea7c62 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Jun 04 18:44:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 18:44:20 2014 +0000 |
| tree | 65491dbc7b64cfdbdf15dd2ae9b240e0a6cf8733 | |
| parent | 6b1715b5b6cc7fdbaaa82422d2f671e54321cbbd [diff] | |
| parent | 9cfe0a64c5d4501d2663a584fdffc4fa7851db51 [diff] |
am 9cfe0a64: (-s ours) Merge "NDK files - do not merge" into lmp-preview-dev * commit '9cfe0a64c5d4501d2663a584fdffc4fa7851db51': NDK files - do not merge