tree e56adcdc5f48531bf87af3269cdb27ebfc5f388d
parent 552f5620d19942dc9844057041e6bab572f08691
parent 4c0b7cc77620f139b4d05d2e7568dd79e651a871
author Hugo Benichi <hugobenichi@google.com> 1485169755 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1485169760 +0000

Merge changes Idbde7000,Idde3c9d0 into nyc-mr2-dev-plus-aosp

* changes:
  DO NOT MERGE ApfFilter: use elapsedRealTime for RA lifetime
  DO NOT MERGE ApfFilter: systematically use u8, u16, u32 getters