| commit | 89bc23b71768f467eaf9258883ea1cdf4a984583 | [log] [tgz] |
|---|---|---|
| author | Roozbeh Pournader <roozbeh@google.com> | Fri Feb 27 14:00:56 2015 -0800 |
| committer | Roozbeh Pournader <roozbeh@google.com> | Fri Feb 27 14:00:56 2015 -0800 |
| tree | eb963ab278ef0634f8e22fa77f17169e782e752a | |
| parent | 334adede009762a01b52d4d84935ad30069b007b [diff] | |
| parent | 01db65d0ea09482a0e9fd2c9c590e70c89ce0c6d [diff] |
resolved conflicts for merge of 01db65d0 to stage-aosp-master Change-Id: I2aa4f4e73984630e0c1edbb63fc1ea9c765c42dd