| commit | 20269bd7c4cf97701a39502364f3a9b5ab365119 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Sep 25 23:49:32 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 25 23:49:32 2013 +0000 |
| tree | 3240e98a46bcac9fd14ebd5d93cb707b38df1dd0 | |
| parent | 331a7aae204479552bea2b3bcc378153edad7528 [diff] | |
| parent | 5023a4df732693fdaff64da551f6b088e7ba4456 [diff] |
Merge "resolved conflicts for merge of 687c6221 to master"