Merge "Bug 3187: Adding mapping list."
authorReinaldo Penno <[email protected]>
Tue, 12 May 2015 20:47:44 +0000 (20:47 +0000)
committerGerrit Code Review <[email protected]>
Tue, 12 May 2015 20:47:44 +0000 (20:47 +0000)

Trivial merge