tree 2c49c14a6532a2155e77f39bca51fa6f640336e0
parent 1a91866400a458138dbb8d46009f4915bbb742e2
parent a8816eaf0e5c3e1ad0d9096e8524942de1338e4a
author Android Build Merger (Role) <android-build-merger@google.com> 1466651589 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466651591 +0000

Merge "Merge \"Fix issue #29532165: System Server Java Crashes in WiFi (RT Restart)\" into nyc-dev am: 576e6d27bd" into nyc-mr1-dev