am 159ad4c0: Merge "Add multi assets folder support + assets in libraries."
Xavier Ducrohet [Wed, 6 Feb 2013 23:34:45 +0000 (15:34 -0800)]
# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '159ad4c01dc1a36e9eac39b2c39b8a642a99517b':
  Add multi assets folder support + assets in libraries.


Trivial merge