tree 13e1451ecc315c5ed5ff7fa557daf20d1c7d3ef6
parent 7916ac221059b8aa6385b255b025aa542bc2de4d
parent 9d9e60286e05ae45025b672636490bd12586138d
author Dmitry Shmidt <dimitrysh@google.com> 1429895646 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1429895646 +0000

Merge "Cumulative security patch from commit ca68a8b561c48393c8ba25055ce294caaa3ac008" into m-wireless-dev