| commit | 0f2dac0f8178b0229370bbde7fa5d5fd55325dbb | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 10 10:36:41 2014 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Fri Oct 10 10:36:41 2014 +0100 |
| tree | a5a1170db74ecae4b173c99612f2084fd5a738b7 | |
| parent | 1a96f3980e7a7017d425352fae65f6b792d1ec48 [diff] | |
| parent | 69c639100ca0776f36add1e6bea1bcbce287db0b [diff] |
resolved conflicts for merge of 69c63910 to jb-mr2-dev-plus-aosp Change-Id: I0981e506ba6c525e019b805b8db8d5af22e05e94