tree fb16e2adb902eacccc408fff1fb14e52db722886
parent b00be001602b84420e02d36d6e6481b22eab2aa3
parent dd66bcbf9d6ef0c50a18d9c4b1b39ce7ef7afcc4
author Elliott Hughes <enh@google.com> 1302635341 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1302635341 -0700

Merge "More native code cleanup."