| commit | e18c3a9764fb4be862ef1127dd243d332d1a8e2b | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Dec 09 21:59:52 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 09 21:59:54 2014 +0000 |
| tree | 9248e7465d96ad82bd897b98c282b0cd08a76d13 | |
| parent | 432067cc4b900850c7767fa41675281dd884b74a [diff] | |
| parent | ead7b78b9eb303115c93f393160a3d91e1e89fab [diff] |
Merge "resolved conflicts for merge of 66189de6 to master"