| commit | 12e249804d3c03f3716b55607ca4da057bbd7e50 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Thu May 11 21:29:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 11 21:29:35 2017 +0000 |
| tree | d8a3a3ddd67306ed882fe7a9094c90db3f869b64 | |
| parent | f17b95bf5e964f9a2e440e2a2763c04b4b6b72d0 [diff] | |
| parent | 5ef9ab98a92462e2c1312ec2554fab7ff625589f [diff] |
Merge "stagefright: put battery update under a separate lock" into oc-dev am: a387a6cc1e am: 5ef9ab98a9 Change-Id: I690de00b95d0ae22394dbd85aae8a6624c2fa69b