| commit | 33a4168a13575acacde96656459f967017b74201 | [log] [tgz] |
|---|---|---|
| author | Andy Huang <ath@google.com> | Tue May 13 00:15:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 00:15:15 2014 +0000 |
| tree | 51b840665434d4529b5e26daa94e5c60e81bf614 | |
| parent | 665453518bf8aeb02cf80f336ac139796bfa104d [diff] | |
| parent | 59993643c7c1e5685fe64099a07e9d2b3330ae78 [diff] |
am 59993643: (-s ours) DO NOT MERGE: get ready to ship * commit '59993643c7c1e5685fe64099a07e9d2b3330ae78': DO NOT MERGE: get ready to ship