Merge "Merge with upstream r66368"
authorTae-Hwan Kim <the81.kim@samsung.com>
Thu, 22 Dec 2011 06:42:58 +0000 (15:42 +0900)
committerGerrit Code Review <gerrit2@localhost>
Thu, 22 Dec 2011 06:42:58 +0000 (15:42 +0900)

Trivial merge