tree 05b13b94e23e2beae844e0919aac16f155621e52
parent 4691e74a6104e1f5d01604bda082872b78f1bcfa
parent 5aab4176932de5e899c03876f64cb6f09a999337
author Michael Wright <michaelwr@google.com> 1494463828 +0000
committer android-build-merger <android-build-merger@google.com> 1494463828 +0000

Merge "Correct PowerManager transaction IDs." into oc-dev
am: 5aab417693

Change-Id: I0c9897e77cbd35991dae21aaec06466f8c071316