| commit | 69935f9a053a14da8677b5957bf72ad1746ebad8 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Dec 12 04:29:11 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 12 04:29:11 2014 +0000 |
| tree | 8797c456827a5266a8e5bb8dfe0b81b9bb0bf97e | |
| parent | ec9b598c7be65abb5ceb9d82e752c50f7e93deab [diff] | |
| parent | 0ca6b7f98085c079ccfb4b799fba5f570380a827 [diff] |
am 4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev automerge: 0ca6b7f * commit '0ca6b7f98085c079ccfb4b799fba5f570380a827': Attempt to fix keyguard missing bug