am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985
automerge: cc7917d

* commit 'cc7917d0ee984fca49fe18b280a9f42947736fbd':
  Fixes wrongly nested braces. Bug: 17499985