Merge "[Map] Upstream sync (r66413, r66459)"
authorTae-Hwan Kim <the81.kim@samsung.com>
Fri, 23 Dec 2011 08:53:21 +0000 (17:53 +0900)
committerGerrit Code Review <gerrit2@localhost>
Fri, 23 Dec 2011 08:53:21 +0000 (17:53 +0900)
commit0228e4bc3e9017f313cd8c43996a6685f5d99a9a
tree2c954b1de2fe2507ab4de5f7759a27b5bd80f852
parentd3e33b4a008e25cb2ab8bf2f08eddd106dd8be9f
parent7a2c54e8d38636d98c63c9d5ccdebf08695ff1f2
Merge "[Map] Upstream sync (r66413, r66459)"