| commit | ab88481dc7f00643bf06f27fd1d0a2e007dc0ea6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jan 16 22:43:19 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 16 22:43:20 2014 +0000 |
| tree | 545cff95ee21501da7361fa7519c2672837b3b57 | |
| parent | d0f2c265d8b7457bbb9b809e00b6e8b18bbef7c9 [diff] | |
| parent | b70375abc2c4da6f868da4eef3d3f059acdf9774 [diff] |
Merge "resolved conflicts for merge of ec9e5891 to master"