Miao Wang 3a0f2f666e am f256091e: am 469b4114: am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev ...

* commit 'f256091ecf56f53f4cf3f4d9e2649fc9bb5bdd84':
  fix BNNM docs

2015-07-15 23:18:46 +00:00

..

java/android/renderscript

am f256091e: am 469b4114: am 675bed54: am ad904cf3: Merge "fix BNNM docs" into mnc-dev

2015-07-15 23:18:46 +00:00

jni

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

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