| commit | 9e332c20aae19ccf130e4cd6fe7fd3b8600604d7 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Nov 19 09:47:06 2014 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Wed Nov 19 09:47:09 2014 -0800 |
| tree | 702104b7289deba50cf49de3aa77e19c017bb190 | |
| parent | 617c23db850070173422757164d2dc88b35c27a1 [diff] | |
| parent | eecc5b7cf59b1b03ab030d01cc2c4875c8287336 [diff] |
resolved conflicts for merge of eecc5b7c to lmp-mr1-dev-plus-aosp Bug: 18432707 Change-Id: I48ae60eeaf724aad18f8bf3da96fed3a3d1408cd