tree ede914584755cf7aeea3384c7b16c39957500466
parent 349ea6de5b64a8e26bc4b13be8861efda5c5d368
parent 60d511ddfa0b5b0c144329cefca917f516344e6d
author Elliott Hughes <enh@google.com> 1324073091 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1324073091 -0800

Merge "Fix the JNI documentation for ICS."