Miao Wang 9ee3b6f136 am ad904cf3: Merge "fix BNNM docs" into mnc-dev ...

* commit 'ad904cf34219897da731eb65f9de53176cc39b20':
  fix BNNM docs

2015-07-15 22:33:14 +00:00

..

java/android/renderscript

am ad904cf3: Merge "fix BNNM docs" into mnc-dev

2015-07-15 22:33:14 +00:00

jni

resolved conflicts for merge of a1867fb0 to mnc-dev-plus-aosp

2015-06-30 23:35:23 -07:00