| commit | 767b7ad7dc6159e187730d90ed12501ca0a4f8eb | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Mon Jan 23 11:09:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 23 11:09:20 2017 +0000 |
| tree | e56adcdc5f48531bf87af3269cdb27ebfc5f388d | |
| parent | 552f5620d19942dc9844057041e6bab572f08691 [diff] | |
| parent | 4c0b7cc77620f139b4d05d2e7568dd79e651a871 [diff] |
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