tree f2aa9ac2e6e144f3449b474a33d83745de5a29cf
parent b6eb9247e57d1fd3b594042c6c7cce5e69adaa80
parent 37fd149ef28abca79291b000abbd422e179926f8
author Jean-Baptiste Queru <jbq@google.com> 1349302644 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1349302651 -0700

Reconcile with jb-dev - do not merge

Change-Id: I5024199169618a15d91232c3232e47f0f2cc8820