| commit | d71d9730231c638bf103417e2c63112528241b80 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 09 23:39:09 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 09 23:39:10 2014 +0000 |
| tree | 3710a3e1d0c3b6fcb38736ed770ea961a51136e1 | |
| parent | 57b78966015772bcbcaffb2e9eee96308db9f36f [diff] | |
| parent | 7b043b928233af644af05c927ee8bc019a8492e7 [diff] |
Merge "resolved conflicts for merge of 78b98d88 to master"