| commit | 0903d5f3c05029f111ca147d5f0d5e7190a85e68 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Aug 05 18:46:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 05 18:46:23 2016 +0000 |
| tree | 0b87dfcef0526fc69ef58e1c033fa0a09c57f938 | |
| parent | 1f9b02b03aa0e8602609584338af83162ac374ec [diff] | |
| parent | c49dfaf4d6161471a68bbc08d947c5d697a507e2 [diff] |
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev am: c49dfaf4d6 Change-Id: I7685cacba8cbe6b7e3d42485e0e9b32d9984651b