tree 76e99d00c2298b04960c32bf932ee23b7ccd45e1
parent 280db65032fe0ed6897bc33c627ae176daecb1c2
parent 780d57b81ac1a9af6ae533f5039cd91a662b49f4
author Jason Sams <jsams@google.com> 1394696344 -0700
committer Jason Sams <jsams@google.com> 1394696424 +0000

resolved conflicts for merge of 780d57b8 to klp-modular-dev

Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0