| commit | 2a32d9f6d37a234832cfd1b1306a6197833b069e | [log] [tgz] |
|---|---|---|
| author | Wale Ogunwale <ogunwale@google.com> | Wed Nov 12 22:15:08 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 12 22:15:08 2014 +0000 |
| tree | 03cd4915226c9ce3e5ad4d5b03e0d6ba1a572ef3 | |
| parent | b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 [diff] | |
| parent | 89b3ecc7b38f9e0601c36176834a66af0f825193 [diff] |
resolve merge conflicts of 2755644 to lmp-mr1-ub-dev. automerge: 89b3ecc * commit '89b3ecc7b38f9e0601c36176834a66af0f825193': Fix build breakage from missing close brace.