tree 81b95eff883b0f5b74d5077fa6515e79c1bab5de
parent 3462e52676c700743899b34496b13412612d1346
parent df7bd91dfa47bb4dffd8edd0dba4cdd4a701d1af
author David Christie <dnchrist@google.com> 1470940046 +0000
committer android-build-merger <android-build-merger@google.com> 1470940046 +0000

Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev
am: df7bd91dfa

Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7