Merge "Update for Arno"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 3 Jun 2015 15:52:08 +0000 (15:52 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Jun 2015 15:52:08 +0000 (15:52 +0000)
commitbc10fd2f65ce70b09cb83998f499421aa1cb8f47
tree7d6ed2c2ff36882e30a9f34c33501574fc9eac28
parentf7ad86c285bcd4f788065879e22bb6a6c991520e
parent61d0e02b467ef4a2be42c6d910607072d81e633d
Merge "Update for Arno"