tree 104e59c62f78c482e80f9c5b7ee4ba7a3a4fb70b
parent f5582005367e1e14dfdfa1bc948140fdd7544f0a
parent 0f9dd1e2f5561c57a2a233a42749dbfe12a5dc44
author Selim Cinek <cinek@google.com> 1459975555 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459975556 +0000

Merge "Deprecated the contentinfo and the number" into nyc-dev