tree a7a8592928ae9fc31220f1a3fb96c79694cd9a21
parent 7188c054ca055ec1a794cde6d0c99761e3f16137
parent 25e4a07ba64add6c3d96804d362bcc1bf00dd9b3
author Ningyuan Wang <nywang@google.com> 1496876014 +0000
committer android-build-merger <android-build-merger@google.com> 1496876014 +0000

Merge "DO NOT MERGE: wifinative jni: check array length for trackSignificantWifiChange" into lmp-mr1-dev am: bb7d4b9c62 am: 7e1a20115a  -s ours am: 316ae70874 am: 4f6f0a0705 am: 6027f5b3c5 am: a1b67289d9  -s ours
am: 25e4a07ba6

Change-Id: Iafdb72ce14d8cf3c50ff6fcef64a1d1f4165e34a